From e8095cc81b5d51283d67c820c3cf771d5e490367 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Mon, 15 Mar 2004 16:27:45 +0000 Subject: [PATCH] set changing_folders to be true so we don't trigger a callback when we Mon Mar 15 10:35:19 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): set changing_folders to be true so we don't trigger a callback when we remove the selection (shortcuts_add_bookmarks): ditto --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkfilechooserdefault.c | 12 ++++++++++++ 6 files changed, 47 insertions(+) diff --git a/ChangeLog b/ChangeLog index 07c50c9f71..54c6f2ab07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Mar 15 10:35:19 2004 Jonathan Blandford + + * gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): set + changing_folders to be true so we don't trigger a callback when we + remove the selection + (shortcuts_add_bookmarks): ditto + Mon Mar 15 10:47:18 2004 Owen Taylor * gtk/gtkfilechooserentry.c: s/seperator/separator/. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 07c50c9f71..54c6f2ab07 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Mon Mar 15 10:35:19 2004 Jonathan Blandford + + * gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): set + changing_folders to be true so we don't trigger a callback when we + remove the selection + (shortcuts_add_bookmarks): ditto + Mon Mar 15 10:47:18 2004 Owen Taylor * gtk/gtkfilechooserentry.c: s/seperator/separator/. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 07c50c9f71..54c6f2ab07 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Mon Mar 15 10:35:19 2004 Jonathan Blandford + + * gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): set + changing_folders to be true so we don't trigger a callback when we + remove the selection + (shortcuts_add_bookmarks): ditto + Mon Mar 15 10:47:18 2004 Owen Taylor * gtk/gtkfilechooserentry.c: s/seperator/separator/. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 07c50c9f71..54c6f2ab07 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Mon Mar 15 10:35:19 2004 Jonathan Blandford + + * gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): set + changing_folders to be true so we don't trigger a callback when we + remove the selection + (shortcuts_add_bookmarks): ditto + Mon Mar 15 10:47:18 2004 Owen Taylor * gtk/gtkfilechooserentry.c: s/seperator/separator/. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 07c50c9f71..54c6f2ab07 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Mon Mar 15 10:35:19 2004 Jonathan Blandford + + * gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): set + changing_folders to be true so we don't trigger a callback when we + remove the selection + (shortcuts_add_bookmarks): ditto + Mon Mar 15 10:47:18 2004 Owen Taylor * gtk/gtkfilechooserentry.c: s/seperator/separator/. diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 953334777a..f7d5525c46 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -1198,6 +1198,10 @@ shortcuts_add_volumes (GtkFileChooserDefault *impl) int start_row; GSList *list, *l; int n; + gboolean old_changing_folders; + + old_changing_folders = impl->changing_folder; + impl->changing_folder = TRUE; start_row = shortcuts_get_index (impl, SHORTCUTS_VOLUMES); shortcuts_remove_rows (impl, start_row, impl->num_volumes, volume_remove_cb); @@ -1232,6 +1236,8 @@ shortcuts_add_volumes (GtkFileChooserDefault *impl) if (impl->shortcuts_filter_model) gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (impl->shortcuts_filter_model)); + + impl->changing_folder = old_changing_folders; } /* Used from shortcuts_remove_rows() */ @@ -1268,6 +1274,10 @@ static void shortcuts_add_bookmarks (GtkFileChooserDefault *impl) { GSList *bookmarks; + gboolean old_changing_folders; + + old_changing_folders = impl->changing_folder; + impl->changing_folder = TRUE; if (impl->num_bookmarks > 0) { @@ -1288,6 +1298,8 @@ shortcuts_add_bookmarks (GtkFileChooserDefault *impl) } if (impl->shortcuts_filter_model) gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (impl->shortcuts_filter_model)); + + impl->changing_folder = old_changing_folders; } /* Appends a separator and a row to the shortcuts list for the current folder */ -- 2.30.2